From d3b444a4c5b7b997fc8619f0b3b7befb284cb298 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Nov 2003 23:16:49 +0000 Subject: [PATCH] Fix for #119555, Peter Zelesny: Tue Nov 18 00:12:55 2003 Matthias Clasen Fix for #119555, Peter Zelesny: * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image. * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public by removing the _ prefix. * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, gdk/gdkwindow.c: Adjust all callers. --- ChangeLog | 10 +++++++++ ChangeLog.pre-2-10 | 10 +++++++++ ChangeLog.pre-2-4 | 10 +++++++++ ChangeLog.pre-2-6 | 10 +++++++++ ChangeLog.pre-2-8 | 10 +++++++++ docs/reference/ChangeLog | 4 ++++ docs/reference/gdk/gdk-sections.txt | 1 + gdk/gdkdraw.c | 32 +++++++++++++++-------------- gdk/gdkdrawable.h | 18 +++++++++++----- gdk/gdkpixbuf-drawable.c | 4 ++-- gdk/gdkpixmap.c | 8 ++++---- gdk/gdkwindow.c | 12 +++++------ 12 files changed, 97 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1d5f74e3f..d9222cdad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Nov 18 00:12:55 2003 Matthias Clasen + + Fix for #119555, Peter Zelesny: + + * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image. + * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public + by removing the _ prefix. + * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, + gdk/gdkwindow.c: Adjust all callers. + Mon Nov 17 23:36:02 2003 Matthias Clasen * gtk/gtkaction.c (gtk_action_activate): Only activate if diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e1d5f74e3f..d9222cdad7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue Nov 18 00:12:55 2003 Matthias Clasen + + Fix for #119555, Peter Zelesny: + + * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image. + * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public + by removing the _ prefix. + * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, + gdk/gdkwindow.c: Adjust all callers. + Mon Nov 17 23:36:02 2003 Matthias Clasen * gtk/gtkaction.c (gtk_action_activate): Only activate if diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e1d5f74e3f..d9222cdad7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Tue Nov 18 00:12:55 2003 Matthias Clasen + + Fix for #119555, Peter Zelesny: + + * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image. + * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public + by removing the _ prefix. + * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, + gdk/gdkwindow.c: Adjust all callers. + Mon Nov 17 23:36:02 2003 Matthias Clasen * gtk/gtkaction.c (gtk_action_activate): Only activate if diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e1d5f74e3f..d9222cdad7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Tue Nov 18 00:12:55 2003 Matthias Clasen + + Fix for #119555, Peter Zelesny: + + * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image. + * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public + by removing the _ prefix. + * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, + gdk/gdkwindow.c: Adjust all callers. + Mon Nov 17 23:36:02 2003 Matthias Clasen * gtk/gtkaction.c (gtk_action_activate): Only activate if diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e1d5f74e3f..d9222cdad7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Tue Nov 18 00:12:55 2003 Matthias Clasen + + Fix for #119555, Peter Zelesny: + + * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image. + * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public + by removing the _ prefix. + * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, + gdk/gdkwindow.c: Adjust all callers. + Mon Nov 17 23:36:02 2003 Matthias Clasen * gtk/gtkaction.c (gtk_action_activate): Only activate if diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 4c83055882..1c5a81b912 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 18 00:12:23 2003 Matthias Clasen + + * gdk/gdk-sections.txt: Add gdk_drawable_copy_to_image. + Mon Nov 17 23:29:21 2003 Matthias Clasen * gtk/gtk-sections.txt: Add gtk_combo_box_new_with_model, diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index a673b1e6cb..8185010263 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -466,6 +466,7 @@ gdk_draw_pixmap gdk_draw_drawable gdk_draw_image gdk_drawable_get_image +gdk_drawable_copy_to_image GDK_DRAWABLE diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index ae8bb124f1..1abb3e9b3e 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -897,7 +897,7 @@ gdk_draw_glyphs (GdkDrawable *drawable, /** - * _gdk_drawable_copy_to_image: + * gdk_drawable_copy_to_image: * @drawable: a #GdkDrawable * @image: a #GdkDrawable, or %NULL if a new @image should be created. * @src_x: x coordinate on @drawable @@ -912,17 +912,19 @@ gdk_draw_glyphs (GdkDrawable *drawable, * and copies into that. See gdk_drawable_get_image() for further details. * * Return value: @image, or a new a #GdkImage containing the contents - of @drawable + * of @drawable + * + * Since: 2.4 **/ GdkImage* -_gdk_drawable_copy_to_image (GdkDrawable *drawable, - GdkImage *image, - gint src_x, - gint src_y, - gint dest_x, - gint dest_y, - gint width, - gint height) +gdk_drawable_copy_to_image (GdkDrawable *drawable, + GdkImage *image, + gint src_x, + gint src_y, + gint dest_x, + gint dest_y, + gint width, + gint height) { GdkDrawable *composite; gint composite_x_offset = 0; @@ -1065,7 +1067,7 @@ gdk_drawable_real_get_image (GdkDrawable *drawable, gint width, gint height) { - return _gdk_drawable_copy_to_image (drawable, NULL, x, y, 0, 0, width, height); + return gdk_drawable_copy_to_image (drawable, NULL, x, y, 0, 0, width, height); } static GdkDrawable* @@ -1457,10 +1459,10 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable, width1, height1, gdk_drawable_get_depth (drawable), &xs0, &ys0); - _gdk_drawable_copy_to_image (drawable, image, - dest_x + x0, dest_y + y0, - xs0, ys0, - width1, height1); + gdk_drawable_copy_to_image (drawable, image, + dest_x + x0, dest_y + y0, + xs0, ys0, + width1, height1); (*composite_func) (pixbuf->pixels + (src_y + y0) * pixbuf->rowstride + (src_x + x0) * 4, pixbuf->rowstride, (guchar*)image->mem + ys0 * image->bpl + xs0 * image->bpp, diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index f250f3ea09..170a6f89ec 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -343,11 +343,19 @@ void gdk_draw_layout_with_colors (GdkDrawable *drawable, #define gdk_draw_bitmap gdk_draw_drawable #endif /* GDK_DISABLE_DEPRECATED */ -GdkImage* gdk_drawable_get_image (GdkDrawable *drawable, - gint x, - gint y, - gint width, - gint height); +GdkImage* gdk_drawable_get_image (GdkDrawable *drawable, + gint x, + gint y, + gint width, + gint height); +GdkImage *gdk_drawable_copy_to_image (GdkDrawable *drawable, + GdkImage *image, + gint src_x, + gint src_y, + gint dest_x, + gint dest_y, + gint width, + gint height); GdkRegion *gdk_drawable_get_clip_region (GdkDrawable *drawable); GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable); diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index 531b635515..7ec5c6d5cf 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -1298,8 +1298,8 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest, image = _gdk_image_get_scratch (gdk_drawable_get_screen (src), width1, height1, depth, &xs0, &ys0); - _gdk_drawable_copy_to_image (src, image, - src_x + x0, src_y + y0, + gdk_drawable_copy_to_image (src, image, + src_x + x0, src_y + y0, xs0, ys0, width1, height1); gdk_pixbuf_get_from_image (dest, image, cmap, diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index f0134c21ec..b7e126b802 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -470,10 +470,10 @@ gdk_pixmap_copy_to_image (GdkDrawable *drawable, { g_return_val_if_fail (GDK_IS_PIXMAP (drawable), NULL); - return _gdk_drawable_copy_to_image (((GdkPixmapObject*)drawable)->impl, - image, - src_x, src_y, dest_x, dest_y, - width, height); + return gdk_drawable_copy_to_image (((GdkPixmapObject*)drawable)->impl, + image, + src_x, src_y, dest_x, dest_y, + width, height); } static GdkBitmap * diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 5ad7cd1df8..e06881e5cf 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1941,12 +1941,12 @@ gdk_window_copy_to_image (GdkDrawable *drawable, _gdk_windowing_window_get_offsets (drawable, &x_offset, &y_offset); - return _gdk_drawable_copy_to_image (((GdkWindowObject*)drawable)->impl, - image, - src_x - x_offset, - src_y - y_offset, - dest_x, dest_y, - width, height); + return gdk_drawable_copy_to_image (((GdkWindowObject*)drawable)->impl, + image, + src_x - x_offset, + src_y - y_offset, + dest_x, dest_y, + width, height); } /* Code for dirty-region queueing -- 2.30.2